cssprovider: Mark whole @import statement on import error
authorBenjamin Otte <otte@redhat.com>
Thu, 11 Apr 2019 04:10:52 +0000 (06:10 +0200)
committerBenjamin Otte <otte@redhat.com>
Fri, 12 Apr 2019 17:34:28 +0000 (19:34 +0200)
gtk/gtkcssprovider.c

index 865a3579529b6261fb254b07194c49714559d7ef..1e841fb2f3662659ff07652406c487d0df48947f 100644 (file)
@@ -711,9 +711,12 @@ parse_import (GtkCssScanner *scanner)
   else if (gtk_css_scanner_would_recurse (scanner, file))
     {
        char *path = g_file_get_path (file);
-       gtk_css_parser_error_import (scanner->parser,
-                                    "Loading '%s' would recurse",
-                                    path);
+       gtk_css_parser_error (scanner->parser,
+                             GTK_CSS_PARSER_ERROR_IMPORT,
+                             gtk_css_parser_get_block_location (scanner->parser),
+                             gtk_css_parser_get_end_location (scanner->parser),
+                             "Loading '%s' would recurse",
+                             path);
        g_free (path);
     }
   else
@@ -1077,9 +1080,12 @@ gtk_css_provider_load_internal (GtkCssProvider *self,
             }
           else
             {
-              gtk_css_parser_error_import (parent->parser, 
-                                           "Failed to import: %s",
-                                           load_error->message);
+              gtk_css_parser_error (parent->parser, 
+                                    GTK_CSS_PARSER_ERROR_IMPORT,
+                                    gtk_css_parser_get_block_location (parent->parser),
+                                    gtk_css_parser_get_end_location (parent->parser),
+                                    "Failed to import: %s",
+                                    load_error->message);
             }
         }
     }